projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2f01d3 360e31b)
bitkeeper revision 1.1183 (420cc313TZKdpM4_m9WvFiEqZsQ13w)
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 11 Feb 2005 14:37:07 +0000 (14:37 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 11 Feb 2005 14:37:07 +0000 (14:37 +0000)
Merge douglas.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into douglas.cl.cam.ac.uk:/local/scratch/sos22/xendbng/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/x86/traps.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/x86/traps.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.